Revision: tlacontrib--ddaa--1.2--patch-11
Archive: ddaa@ddaa.net--2004
Creator: David Allouche <david@allouche.net>
Date: Fri Mar 19 22:29:18 CET 2004
Standard-date: 2004-03-19 21:29:18 GMT
Modified-files: tlash/tlash
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlacontrib--tlash--0--base-0
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--tlash--0--patch-1
    aaron.bentley@utoronto.ca--tla-2004/tlacontrib--tlash--0--patch-2
    ddaa@ddaa.net--2004/tlacontrib--ddaa--1.2--patch-11
Summary: star-merge -t abentley's tlash--0--patch-2
Keywords: 

That does not seem to provide a real aba integration yet, only some
groundwork.

Performed a three-way merge to resolve idempotence conflicts with
previous revision.


Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--tlash--0--base-0
   tag of aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-84

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--tlash--0--patch-1
   Credit where credit's due

 * aaron.bentley@utoronto.ca--tla-2004/tlacontrib--tlash--0--patch-2
   Provided the abadir variable that my weakling aba scripts require

